Revision: arch--devo--1.0--patch-30
Archive: lord@emf.net--2003
Creator: Tom Lord <lord@emf.net>
Date: Tue Jan 21 17:10:17 PST 2003
Standard-date: 2003-01-22 01:10:17 GMT
Summary: "fixed" star-merge "bug", tweaked `join-branch' (Issue35)
Keywords: 
New-files: {arch}/arch/arch--devo/arch--devo--1.0/lord@emf.net--2003/patch-log/patch-30
Modified-files: ChangeLog
  ChangeLog.d/geisler@ece.nwu.edu--public/ChangeLog.geisler--1.0
  ChangeLog.d/geisler@ece.nwu.edu--src/ChangeLog.geisler--1.0
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord--1.0
  ChangeLog.d/lord@regexps.com--2002/ChangeLog.lord-doc--1.0
  branching-and-merging/join-branch.sh
  branching-and-merging/star-merge.sh
New-patches: lord@emf.net--2003/arch--devo--1.0--patch-30


Suppose that V is a version and B a branch from that version.

Initially, project tree's from V have no patch log from B, so
`star-merge' will not work with them.

It has been proposed that `star-merge' should implicitly `join-branch'
the branch in such cases.

I don't think that's a good idea: the error currently given by
`star-merge' might mean that B is not really what the user wanted
to merge in.  The user should see the error and decide for herself.

So, this change expands the error message a bit, advising users
to consider using `join-branch' explicitly.

`join-branch' has gained a small convenience addition that hopefully
won't create too many problems.  The branch name may now be
abbreviated as it's version name, with `base-0' assumed.

(c.f. Issue35 in http://bugs.fifthvision.net:8080/larch/)

